From d06dcaf64631ccb38a4be5d68417b449e6bdc8c8 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Wed, 10 May 2006 15:52:06 -0600 Subject: [PATCH] [IA64] linux: ia64 Kconfig changes of kconfig for dom0 vp model. Signed-off-by: Isaku Yamahata --- buildconfigs/linux-defconfig_xen0_ia64 | 16 ++++++++ buildconfigs/linux-defconfig_xenU_ia64 | 16 ++++++++ buildconfigs/linux-defconfig_xen_ia64 | 16 ++++++++ linux-2.6-xen-sparse/arch/ia64/Kconfig | 51 +++++++------------------- 4 files changed, 61 insertions(+), 38 deletions(-) diff --git a/buildconfigs/linux-defconfig_xen0_ia64 b/buildconfigs/linux-defconfig_xen0_ia64 index d8218986ad..7d7aa15e03 100644 --- a/buildconfigs/linux-defconfig_xen0_ia64 +++ b/buildconfigs/linux-defconfig_xen0_ia64 @@ -1523,3 +1523,19 @@ CONFIG_CRYPTO_DES=y # # Hardware crypto devices # +# CONFIG_NO_IDLE_HZ is not set +# CONFIG_XEN_PCIDEV_BACKEND is not set +# CONFIG_XEN_BLKDEV_TAP_BE is not set +# CONFIG_XEN_NETDEV_BACKEND is not set +# CONFIG_XEN_TPMDEV_BACKEND is not set +# CONFIG_XEN_NETDEV_FRONTEND is not set +# CONFIG_XEN_BLKDEV_TAP is not set +# CONFIG_XEN_SCRUB_PAGES is not set +# CONFIG_HAVE_ARCH_ALLOC_SKB is not set +# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set + +# +# XEN +# +# CONFIG_XEN_UNPRIVILEGED_GUEST is not set +# CONFIG_XEN_DISABLE_SERIAL is not set diff --git a/buildconfigs/linux-defconfig_xenU_ia64 b/buildconfigs/linux-defconfig_xenU_ia64 index 2533610666..b27910025c 100644 --- a/buildconfigs/linux-defconfig_xenU_ia64 +++ b/buildconfigs/linux-defconfig_xenU_ia64 @@ -1387,3 +1387,19 @@ CONFIG_CRYPTO_DES=y # # Hardware crypto devices # +# CONFIG_NO_IDLE_HZ is not set +# CONFIG_XEN_PCIDEV_BACKEND is not set +# CONFIG_XEN_BLKDEV_TAP_BE is not set +# CONFIG_XEN_NETDEV_BACKEND is not set +# CONFIG_XEN_TPMDEV_BACKEND is not set +# CONFIG_XEN_NETDEV_FRONTEND is not set +# CONFIG_XEN_BLKDEV_TAP is not set +# CONFIG_XEN_SCRUB_PAGES is not set +# CONFIG_HAVE_ARCH_ALLOC_SKB is not set +# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set + +# +# XEN +# +# CONFIG_XEN_UNPRIVILEGED_GUEST is not set +# CONFIG_XEN_DISABLE_SERIAL is not set diff --git a/buildconfigs/linux-defconfig_xen_ia64 b/buildconfigs/linux-defconfig_xen_ia64 index 4128bbe86f..5ac52b3508 100644 --- a/buildconfigs/linux-defconfig_xen_ia64 +++ b/buildconfigs/linux-defconfig_xen_ia64 @@ -1529,3 +1529,19 @@ CONFIG_CRYPTO_DES=y # # Hardware crypto devices # +# CONFIG_NO_IDLE_HZ is not set +# CONFIG_XEN_PCIDEV_BACKEND is not set +# CONFIG_XEN_BLKDEV_TAP_BE is not set +# CONFIG_XEN_NETDEV_BACKEND is not set +# CONFIG_XEN_TPMDEV_BACKEND is not set +# CONFIG_XEN_NETDEV_FRONTEND is not set +# CONFIG_XEN_BLKDEV_TAP is not set +# CONFIG_XEN_SCRUB_PAGES is not set +# CONFIG_HAVE_ARCH_ALLOC_SKB is not set +# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set + +# +# XEN +# +# CONFIG_XEN_UNPRIVILEGED_GUEST is not set +# CONFIG_XEN_DISABLE_SERIAL is not set diff --git a/linux-2.6-xen-sparse/arch/ia64/Kconfig b/linux-2.6-xen-sparse/arch/ia64/Kconfig index 9dfbec6db3..0f4a19c0bb 100644 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig @@ -63,32 +63,6 @@ config ARCH_XEN help TEMP ONLY. Needs to be on for drivers/xen to build. -config XEN_PRIVILEGED_GUEST - bool "Privileged Guest" - default n - help - Used in drivers/xen/privcmd.c. Should go away? - -config XEN_BLKDEV_GRANT - depends on XEN - bool - default y - -config XEN_BLKDEV_FRONTEND - depends on XEN - bool - default y - -config XEN_BACKEND - depends on XEN - bool - default y - -config XEN_BLKDEV_BACKEND - depends on XEN && XEN_BACKEND - bool - default y - config XEN_IA64_DOM0_VP bool "dom0 vp model" depends on XEN @@ -103,18 +77,6 @@ config XEN_IA64_DOM0_NON_VP help dom0 P=M model -config XEN_SYSFS - bool "Export Xen attributes in sysfs" - depends on XEN && SYSFS - default y - help - Xen hypervisor attributes will show up under /sys/hypervisor/. - -config XEN_INTERFACE_VERSION - hex - depends on XEN - default 0x00030202 - config SCHED_NO_NO_OMIT_FRAME_POINTER bool default y @@ -532,3 +494,16 @@ source "arch/ia64/Kconfig.debug" source "security/Kconfig" source "crypto/Kconfig" + +# override default values of drivers/xen/Kconfig +if !XEN_IA64_DOM0_VP +config HAVE_ARCH_ALLOC_SKB + bool + default n + +config HAVE_ARCH_DEV_ALLOC_SKB + bool + default n +endif + +source "drivers/xen/Kconfig" -- 2.30.2